Merge branch 'cdbs'
authorStefano Zacchiroli <zack@debian.org>
Sat, 16 Sep 2006 14:06:54 +0000 (14:06 +0000)
committerStefano Zacchiroli <zack@debian.org>
Sat, 16 Sep 2006 14:06:54 +0000 (14:06 +0000)
commit062e233130170c975a1eb2ae19262682f34961c2
tree62a77f644d7173947d2be469d0cccc08deb06c6c
parent0bf8f3ff282c8831e840c05af66b5efab66cbf3d
parent0d616ad3ce35682a731bf6669d69dd87e1d4ad6c
Merge branch 'cdbs'